merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 14 Sep 2011 00:47:13 +0000 (09:47 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 14 Sep 2011 00:47:13 +0000 (09:47 +0900)

Trivial merge